add several missing instances of Alex's name, remove conflict indicators
authorOwen Taylor <otaylor@src.gnome.org>
Mon, 29 Jan 2001 20:13:35 +0000 (20:13 +0000)
committerOwen Taylor <otaylor@src.gnome.org>
Mon, 29 Jan 2001 20:13:35 +0000 (20:13 +0000)
commit09b9317283c1b0f4deb04afe331138c5ca9cebe8
tree3e6ae91bafd49005e2a4368284075f5890d6325b
parentf197495d1c4811a4241d5d3074efc37d7a6c4b54
add several missing instances of Alex's name, remove conflict indicators
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8